From: Owen W. Taylor <otaylor@fishsoup.net>
Date: Thu, 4 Sep 2014 14:01:52 +0000 (-0400)
Subject: Fix problem when background settings change multiple times in rapid succession
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~2188
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=8096e71c536781759a58efb3c9aa56f150c17f7e;p=gnome-shell.git

Fix problem when background settings change multiple times in rapid succession

The code that cleaned up when a background actor was destroyed tried to access
the Background as backgroundActor.background._delegate but when the destroy
signal is emitted, the MetaBackgroundActor was already disposed and
backgroundActor.background NULL.
---

diff --git a/js/ui/background.js b/js/ui/background.js
index ea5cae473..00b9d6375 100644
--- a/js/ui/background.js
+++ b/js/ui/background.js
@@ -701,7 +701,7 @@ const BackgroundManager = new Lang.Class({
                 background.disconnect(changeSignalId);
 
             if (backgroundActor.loadedSignalId)
-                backgroundActor.background._delegate.disconnect(backgroundActor.loadedSignalId);
+                background.disconnect(backgroundActor.loadedSignalId);
         }));
 
         return backgroundActor;